Interval formatters #17
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
reason is that we need to use it in tests where values need to implement Eq and Show
safareli
commented
Jun 23, 2017
bower.json
Outdated
| "purescript-fixed-points": "^4.0.0", | ||
| "purescript-datetime": "^3.0.0" | ||
| "purescript-datetime": "git://github.com/safareli/purescript-datetime.git#interval", |
There was a problem hiding this comment.
🛑 should be changed after purescript/purescript-datetime#52 is merged
|
@cryogenian can you take another look. |
|
@cryogenian can you take another look |
cryogenian
approved these changes
Jun 26, 2017
src/Data/Formatter/DateTime.purs
Outdated
|
|
||
| exactLength ∷ ∀ e. ReaderT { maxLength ∷ Int, length ∷ Int | e } (Either String) Unit | ||
| exactLength = ask >>= \({maxLength, length}) → if maxLength /= length | ||
| then lift $ Left $ "Expected " <> (show maxLength) <> " digits but got " <> (show length) |
There was a problem hiding this comment.
Both branches have lift you can put it before if
src/Data/Formatter/DateTime.purs
Outdated
|
|
||
| validateRange ∷ ∀ e. Int → Int → ReaderT { num ∷ Int | e } (Either String) Unit | ||
| validateRange min max = ask >>= \({num}) → if num < min || num > max | ||
| then lift $ Left $ "Number is out of range [ " <> (show min) <> ", " <> (show max) <> " ]" |
cryogenian
reviewed
Jun 27, 2017
src/Data/Formatter/DateTime.purs
Outdated
| -- | | ||
| -- | The `Lazy` constraint is used to generate the result lazily, to ensure | ||
| -- | termination. | ||
| takeSome :: forall f a. Alternative f => Z.Lazy (f (List.List a)) => Int -> f a -> f (List.List a) |
There was a problem hiding this comment.
Inconsistent arrows and forall symbols here
src/Data/Formatter/DateTime.purs
Outdated
| → P.ParserT String m Int | ||
| parseInt maxLength validators errMsg = do | ||
| ds ← takeSome maxLength parseDigit | ||
| let length = List.length ds |
src/Data/Formatter/DateTime.purs
Outdated
| YearTwoDigits → _{year = _} `modifyWithParser` | ||
| (parseInt 2 exactLength "Incorrect 2-digit year") | ||
| YearAbsolute → _{year = _} `modifyWithParser` | ||
| (pure (*) |
src/Data/Formatter/DateTime.purs
Outdated
| , minute: Just $ fromEnum $ T.minute t | ||
| , second: Just $ fromEnum $ T.second t | ||
| , millisecond: Just $ fromEnum $ T.millisecond t | ||
| , meridiem: (Nothing ∷ Maybe Meridiem) |
There was a problem hiding this comment.
Is this annotation still needed?
| parseIsoDuration = do | ||
| dur ← parseDuration | ||
| case mkIsoDuration dur of | ||
| Left errs → let errorStr = intercalate ", " (prettyError <$> errs) |
There was a problem hiding this comment.
Kinda non-common formatting. Could you put let on the next line?
| notEmpty p str = p >>= \x → if x == mempty then P.fail str else pure x | ||
|
|
||
| mkComponentsParser ∷ Array (Tuple (Number → I.Duration) String) → P.Parser String I.Duration | ||
| mkComponentsParser arr = p `notEmpty` ("None of valid duration components (" <> (show $ snd <$> arr) <> ") were present") |
There was a problem hiding this comment.
I'd suggest using operator instead of infix function here. Like <?> in strongcheck. Or prefix func application. It's a bit mistyfying in that case, I mean infix notEmpty, maybe msgIfEmpty or something else.
Compare:
p <:?:> "Critical Error!!!"
nonEmptyParser p "Critical Error!!!"
p `messageIfInputIsEmpty` "Critical Error!!!"
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on purescript/purescript-datetime#52